Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arcadia drip #341

Merged
merged 13 commits into from
Sep 28, 2023
Merged

Arcadia drip #341

merged 13 commits into from
Sep 28, 2023

Conversation

AjexRose
Copy link
Contributor

@AjexRose AjexRose commented Sep 20, 2023

About the PR

Added clothing for the faction of Arcadia Industries as well as a vendor for them
The vendor is temporarily available as a Expedition reward, as a way for players to unlock it until a PoI for Arcadia Industries is made.

Why / Balance

During the townhall, there were mentions of inserting more player made factions into the frontier, so I thought this would be a good start.

Changelog

added: Arcadia Industries is now beginning marketing in the frontier with unique clothing items, unlockable by those with combat prowess in expeditions

@AjexRose AjexRose marked this pull request as ready for review September 21, 2023 14:28
@Cheackraze
Copy link
Member

love it. My only issue is, we need to keep all of our entities separated from the base game files. So for all of your yml entries, we need new files created inside /prototypes/_NF/ instead of adding to the vanilla ones.

This is so that maintainers (just me for now) have a much, MUCH easier time when it comes to bringing in changes from vanilla SS14 so that the files do not conflict. Once we get everything split into their own files, we can get this in and start making a POI for you guys!

@AjexRose
Copy link
Contributor Author

Alrighty, I'll try to get all the files to the _NF section of the code!

@AjexRose
Copy link
Contributor Author

@Cheackraze The Arcadia Clothing hopefully all fully within the _NF folders now.

@Cheackraze Cheackraze merged commit 042ca8c into new-frontiers-14:master Sep 28, 2023
14 of 16 checks passed
VMSolidus added a commit to VMSolidus/frontier-station-14 that referenced this pull request Sep 25, 2024
![SM
boom](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/6937c520-0963-437c-a9a6-49afe6c8b787)

![New edge
supermatter](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/e8305536-b777-41f8-b9bf-295d402dc1bf)

This PR has been produced in collaboration with coders from White Dream,
with written permission given by the relevant code owners to port this
specific slice of content to Einstein-Engines. Supermatter Engines are a
form of nuclear reactor, which produces energy in the form of
radioactive particles, while also decaying into Phoron when excited by
an external energy source.

Power can be obtained from the engine via radiation collectors, which
like those of a singularity engine, must be periodically refueled. In
addition, the engine must also be actively cooled via aid from
Atmospherics, and for undesirable gasses to be extracted from the
reactor chamber.

If not cooled, the crystal will begin to destabilize and eventually
collapse into one of three different situations depending on the source
of its instability.
1. A nuclear blast.
2. A gravitational singularity
3. A Tesla ball

:cl: VMSolidus, White Dream, Colin-Tel
- add: Supermatter Engines have been implemented.

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: username <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants